-
Notifications
You must be signed in to change notification settings - Fork 14
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add NetP subscription integration #1710
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 tasks
# By Alexey Martemyanov (4) and others # Via GitHub * develop: Fix an issue with NetP debug menu options (#1717) Update BSK for iOS Autofill on by default changes (#1699) Removes iOS phased rollout dry run pixel (#1706) NetP connection notifications improvements (#1730) Fix PixelExperiment tests (#1708) Add Safari Technology Preview data import source (#1720) remove failedToImport state (#1722) DBP: Add pixel to measure parent/child broker relationship (#1709) fix crash on Reset Bookmarks (#1719) Upload .xcresult artifacts on PR test failure (#1715) Support to deprecated flag on ProfileQuery (#1698) Bump BSK to latest version (#1716) Surgical update to fb-sdk.js (#1711) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons
commented
Oct 8, 2023
samsymons
commented
Oct 8, 2023
samsymons
commented
Oct 8, 2023
...tworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionSubscriptionEventHandler.swift
Show resolved
Hide resolved
samsymons
commented
Oct 8, 2023
...tworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionSubscriptionEventHandler.swift
Outdated
Show resolved
Hide resolved
samsymons
commented
Oct 8, 2023
graeme
approved these changes
Oct 13, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! Just a couple of minor non-blocking comments.
...tworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionSubscriptionEventHandler.swift
Outdated
Show resolved
Hide resolved
# By Dominik Kapusta (28) and others # Via Dominik Kapusta (12) and others * develop: (185 commits) bump bsk for cbr user script energy optimisation (#1888) Add folders from the Bookmark Creation Popover (#1861) DBP: Prepare database for external users (#1880) Address Bar Spoofing Remediations + Test Cases (#1815) 1.65.1 (83) Update BSK ref Set version to 1.64.3 (82) Update embedded files Fix migration to form-factor-specific favorites (#1884) Revert "Breakage report improvements" (#1885) Breakage report improvements (#1864) Assign no action to menu item if it represents a bookmark folder (#1881) dbp: updating CSS for access to DBP JS (#1879) Fix tests (#1882) Remove DBP target and merge DBP to DevID target (#1876) Bump autoconsent to 6.4.0 (#1869) Fixes a bug where an observer was not being released (#1878) DBP: Delete old native UI code (#1877) DBP: Fix deleting all data breaking a foreign constraint (#1871) Queue access to XPCConnectionsManager's connections for thread safety (#1875) ... # Conflicts: # Configuration/App/DuckDuckGoPrivacyPro.xcconfig # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved # DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift # DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift # LocalPackages/BuildToolPlugins/Plugins/InputFilesChecker/InputFilesChecker.swift
# By Dominik Kapusta (41) and others # Via Dominik Kapusta (9) and others * main: (138 commits) Make sure when we set custom config url, we don't expect etag in return (#1994) Add PixelKit source parameter (#1989) Fix internal user toggling (#2000) Show alert and display warning icon in Sync Settings when data syncing is disabled (#1996) DBP: Integrate subscription account authentication to DBP (#1995) Improve bookmarks html reader (#1986) Add Sync feature flags (#1992) Add daily stats pixel (#1993) Do not reload DBP tab when switching to it (#1942) Fix: external application requests via redirect URLs shows wrong origin. (#1900) Update clean-app.sh to work on macOS Sonoma and include NetP containers (#1988) Fix: "SwiftLintPlugin" must be enabled before it can be used (#1987) Prevent VPN server list persistence failures (#1985) add test can remove data (#1980) Remove VPN upgrade card (#1983) Fix low-res VPN warning asset (#1984) DBP: Fix unreliable date tests (#1981) Add search retention pixel for NetP (#1964) Sabrina/sync e2e tests (#1959) swiftlint build plugin (#1318) ... # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved # DuckDuckGo/Application/AppDelegate.swift
# By Diego Rey Mendez (4) and others # Via Fernando Bunn (2) and GitHub (1) * main: Adds option + click support for our VPN menu to show some useful debu… (#2007) Update latency & tunnel failure monitor implementation (#2005) Prevents VPNSettings from reporting fake changes (#2004) Updates the copy for the VPN status bar item context menu (#2003) Implement subscription purchase (#1906) DBP: Add m_mac prefix to Pixels (#1952) Bump version to 1.69.0 (96) Update embedded files Update Link Tracking Protection to preserve headers (#1965) VPN menus improvements (#1979) Data Import ux redo (#1754) Fix: "SwiftLintPlugin" must be enabled before it can be used (#1987) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved # DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
samsymons
added a commit
to duckduckgo/BrowserServicesKit
that referenced
this pull request
Dec 25, 2023
Required: Task/Issue URL: https://app.asana.com/0/0/1205645389501250/f iOS PR: duckduckgo/iOS#2077 macOS PR: duckduckgo/macos-browser#1710 What kind of version bump will this require?: Major Description: This PR adds support for exchanging access tokens for auth tokens.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Task/Issue URL: https://app.asana.com/0/0/1205645389501251/f
Tech Design URL:
CC:
Description:
This PR integrates NetP with the subscription library.
Steps to test this PR:
Unfortunately, this isn't really possible to test at the moment. Here's what the flow would normally look like though, in case you want to try:
DuckDuckGo Privacy Pro
target on this branchPrivacy Pro
, check that you are signed inInternal references:
Pull Request Review Checklist
Software Engineering Expectations
Technical Design Template
Pull Request Documentation